bitkeeper revision 1.1159.212.26 (41f28aabyam1d9KxJTuTjomL3m7ZlA)

manual merge

diff --cc linux-2.6.10-xen-sparse/arch/xen/Kconfig
index 6d78869bece8f9f46fe35697211b46dc8fcef03e,cfc3ea04c4f92ac2ecbedd1368c6258a43bb7302..6e66892032f7375803620fcf2de192ef193b58d9
--- 1/linux-2.6.10-xen-sparse/arch/xen/Kconfig
--- 2/linux-2.6.10-xen-sparse/arch/xen/Kconfig
+++ b/linux-2.6.10-xen-sparse/arch/xen/Kconfig
@@@ -49,24 -48,10 +48,23 @@@ config XEN_BLKDEV_BACKEN
            block devices to other guests via a high-performance shared-memory
            interface.
  
- if XEN_BLKDEV_BACKEND
 +config XEN_BLKDEV_TAP_BE
 +        bool "Block Tap support for backend driver (DANGEROUS)"
++      depends on XEN_BLDEV_BACKEND
 +        default n
 +        help
 +          If you intend to use the block tap driver, the backend domain will
 +          not know the domain id of the real frontend, and so will not be able
 +          to map its data pages.  This modifies the backend to attempt to map
 +          from both the tap domain and the real frontend.  This presents a
 +          security risk, and so should ONLY be used for development
 +          with the blktap.  This option will be removed as the block drivers are
 +          modified to use grant tables.
- endif
 +
  config XEN_NETDEV_BACKEND
          bool "Network-device backend driver"
-         default y if XEN_PHYSDEV_ACCESS
-         default n if !XEN_PHYSDEV_ACCESS
+       depends on XEN_PHYSDEV_ACCESS
+         default y
          help
            The network-device backend driver allows the kernel to export its
            network devices to other guests via a high-performance shared-memory
@@@ -106,18 -91,7 +104,17 @@@ config XEN_NETDEV_FRONTEND_PIPELINED_TR
            like reassembling packets to perform firewall filtering; or if you
            are unsure; or if you experience network hangs when this option is
            enabled; then you must say N here.
- endif
  
 +config XEN_BLKDEV_TAP
 +        bool "Block device tap driver"
 +        default n
 +        help
 +          This driver allows a VM to interact on block device channels
 +          to other VMs.  Block messages may be passed through or redirected
 +          to a character device, allowing device prototyping in application
 +          space.  Odds are that you want to say N here.
 +
 +
  config XEN_WRITABLE_PAGETABLES
        bool
        default y